From: Glenn Morris Date: Sat, 15 Jan 2011 21:51:36 +0000 (-0800) Subject: * admin/notes/bzr: More on previous. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5188 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e678788ae4f2edb9ce6f6f317c0fd2216aa2e74e;p=emacs.git * admin/notes/bzr: More on previous. --- diff --git a/admin/notes/bzr b/admin/notes/bzr index 440487e9160..7a668b13f1c 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -67,3 +67,8 @@ You can commit either before you do this (eg if you had a lot of conflicts to resolve and don't want to get confused), or refrain from committing until bzrmerge has merged all revisions. +Before committing, check bzr status and bzr diff output. + +Note that ChangeLog entries are automatically merged to the top with +today's date, but you still might want to check them to see that too +much is not being included.